From d7418f894f0af52b6c19ea59087ff1595da4356d Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 5 Jul 2006 16:22:50 +0000 Subject: [PATCH] Fix some assignments involving booleans. (#346467, Christian Persch) 2006-07-05 Matthias Clasen * gtk/gtkwindow.c (gtk_window_unmap, gtk_window_set_keep_above) (gtk_window_set_keep_below): Fix some assignments involving booleans. (#346467, Christian Persch) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ gtk/gtkwindow.c | 14 +++++++------- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index d50e3bac6f..3938809d09 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-07-05 Matthias Clasen + + * gtk/gtkwindow.c (gtk_window_unmap, gtk_window_set_keep_above) + (gtk_window_set_keep_below): Fix some assignments involving + booleans. (#346467, Christian Persch) + 2006-07-03 Matthias Clasen * gtk/gtkgamma.c: Use serialized pixbufs instead of xpms. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index d50e3bac6f..3938809d09 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2006-07-05 Matthias Clasen + + * gtk/gtkwindow.c (gtk_window_unmap, gtk_window_set_keep_above) + (gtk_window_set_keep_below): Fix some assignments involving + booleans. (#346467, Christian Persch) + 2006-07-03 Matthias Clasen * gtk/gtkgamma.c: Use serialized pixbufs instead of xpms. diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 5cbd90fd59..b8a7c502c5 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -4208,11 +4208,11 @@ gtk_window_unmap (GtkWidget *widget) } state = gdk_window_get_state (widget->window); - window->iconify_initially = state & GDK_WINDOW_STATE_ICONIFIED; - window->maximize_initially = state & GDK_WINDOW_STATE_MAXIMIZED; - window->stick_initially = state & GDK_WINDOW_STATE_STICKY; - priv->above_initially = state & GDK_WINDOW_STATE_ABOVE; - priv->below_initially = state & GDK_WINDOW_STATE_BELOW; + window->iconify_initially = (state & GDK_WINDOW_STATE_ICONIFIED) != 0; + window->maximize_initially = (state & GDK_WINDOW_STATE_MAXIMIZED) != 0; + window->stick_initially = (state & GDK_WINDOW_STATE_STICKY) != 0; + priv->above_initially = (state & GDK_WINDOW_STATE_ABOVE) != 0; + priv->below_initially = (state & GDK_WINDOW_STATE_BELOW) != 0; } static void @@ -6597,7 +6597,7 @@ gtk_window_set_keep_above (GtkWindow *window, widget = GTK_WIDGET (window); priv = GTK_WINDOW_GET_PRIVATE (window); - priv->above_initially = setting; + priv->above_initially = setting != FALSE; if (setting) priv->below_initially = FALSE; @@ -6651,7 +6651,7 @@ gtk_window_set_keep_below (GtkWindow *window, widget = GTK_WIDGET (window); priv = GTK_WINDOW_GET_PRIVATE (window); - priv->below_initially = setting; + priv->below_initially = setting != FALSE; if (setting) priv->above_initially = FALSE; -- 2.30.2